Fix a segfault. (#115284, Jan Kratochvil)

2003-08-08  Matthias Clasen  <maclas@gmx.de>

	* gdk/gdkregion-generic.c (gdk_region_spans_intersect_foreach): Fix a segfault.  (#115284,
	Jan Kratochvil)

diff --git a/ChangeLog b/ChangeLog
index e811c5083faa18e1f31f98989b3d2ffc898190f0..a52c735d998eedd092418b30183ac58eeee062e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-08  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk/gdkregion-generic.c (gdk_region_spans_intersect_foreach): Fix a segfault.  (#115284, 
+       Jan Kratochvil) 
+
 2003-08-08  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_event): Print also the root

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e811c5083faa18e1f31f98989b3d2ffc898190f0..a52c735d998eedd092418b30183ac58eeee062e6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-08-08  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk/gdkregion-generic.c (gdk_region_spans_intersect_foreach): Fix a segfault.  (#115284, 
+       Jan Kratochvil) 
+
 2003-08-08  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_event): Print also the root

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e811c5083faa18e1f31f98989b3d2ffc898190f0..a52c735d998eedd092418b30183ac58eeee062e6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-08-08  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk/gdkregion-generic.c (gdk_region_spans_intersect_foreach): Fix a segfault.  (#115284, 
+       Jan Kratochvil) 
+
 2003-08-08  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_event): Print also the root

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e811c5083faa18e1f31f98989b3d2ffc898190f0..a52c735d998eedd092418b30183ac58eeee062e6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-08-08  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk/gdkregion-generic.c (gdk_region_spans_intersect_foreach): Fix a segfault.  (#115284, 
+       Jan Kratochvil) 
+
 2003-08-08  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_event): Print also the root

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e811c5083faa18e1f31f98989b3d2ffc898190f0..a52c735d998eedd092418b30183ac58eeee062e6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-08-08  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk/gdkregion-generic.c (gdk_region_spans_intersect_foreach): Fix a segfault.  (#115284, 
+       Jan Kratochvil) 
+
 2003-08-08  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_event): Print also the root

diff --git a/gdk/gdkregion-generic.c b/gdk/gdkregion-generic.c
index 7db4591377e7eda9ab356ec39f179012a74ae133..14bca401de385bf75c13fa269dd2d69dc0da3f53 100644 (file)
--- a/gdk/gdkregion-generic.c
+++ b/gdk/gdkregion-generic.c
@@ -1715,10 +1715,6 @@ gdk_region_spans_intersect_foreach (GdkRegion  *region,
   if ((!region->numRects) || (n_spans == 0))
     return;
 
-  y = span->y;
-  left = span->x;
-  right = span->x + span->width; /* right is not in the span! */
-
   /* The main method here is to step along the
    * sorted rectangles and spans in lock step, and
    * clipping the spans that are in the current